diff --git a/include/context.hpp b/include/context.hpp
index a8b104c..cdb8830 100644
--- a/include/context.hpp
+++ b/include/context.hpp
@@ -115,7 +115,7 @@ namespace Fig
                 throw RuntimeError(FStringView(std::format("Variable '{}' not defined", name.toBasicString())));
             }
         }
-        void def(const FString &name, const TypeInfo &ti, AccessModifier am, const Object &value = Any())
+        void def(const FString &name, const TypeInfo &ti, AccessModifier am, const Object &value = Object::getNullInstance())
         {
             if (containsInThisScope(name))
             {
diff --git a/include/value.hpp b/include/value.hpp
index 656d355..59b9b58 100644
--- a/include/value.hpp
+++ b/include/value.hpp
@@ -441,5 +441,5 @@ namespace Fig
         }
     };
 
-    using Any = Object;
+    using ObjectPtr = std::shared_ptr<Object>;
 } // namespace Fig