diff --git a/deps/ox/src/ox/mc/test/tests.cpp b/deps/ox/src/ox/mc/test/tests.cpp
index 1ff87d10..08c4a0fe 100644
--- a/deps/ox/src/ox/mc/test/tests.cpp
+++ b/deps/ox/src/ox/mc/test/tests.cpp
@@ -316,7 +316,7 @@ std::map<ox::StringView, ox::Error(*)()> tests = {
 				testIn.Union.Int = 93;
 				oxAssert(ox::writeMC(dataBuff.data(), dataBuff.size(), testIn), "Data generation failed");
 				ox::TypeStore typeStore;
-				const auto [type, typeErr] = ox::buildTypeDef(&typeStore, &testIn);
+				const auto [type, typeErr] = ox::buildTypeDef(typeStore, testIn);
 				oxAssert(typeErr, "Descriptor write failed");
 				ox::ModelObject testOut;
 				oxReturnError(testOut.setType(type));
@@ -368,7 +368,7 @@ std::map<ox::StringView, ox::Error(*)()> tests = {
 				 testIn.Struct.IString = "Test String 2";
 				 oxAssert(ox::writeMC(dataBuff, dataBuffLen, testIn), "Data generation failed");
 				 ox::TypeStore typeStore;
-				 const auto [type, typeErr] = ox::buildTypeDef(&typeStore, &testIn);
+				 const auto [type, typeErr] = ox::buildTypeDef(typeStore, testIn);
 				 oxAssert(typeErr, "Descriptor write failed");
 				 ox::BufferReader br({dataBuff, dataBuffLen});
 				 oxReturnError(ox::walkModel<ox::MetalClawReader>(type, br,
diff --git a/deps/ox/src/ox/model/descwrite.hpp b/deps/ox/src/ox/model/descwrite.hpp
index 089314d5..817bfc14 100644
--- a/deps/ox/src/ox/model/descwrite.hpp
+++ b/deps/ox/src/ox/model/descwrite.hpp
@@ -357,8 +357,8 @@ constexpr const DescriptorType *TypeDescWriter::getType(StringViewCR tn, int typ
 }
 
 template<typename T>
-constexpr Result<DescriptorType*> buildTypeDef(TypeStore *typeStore) noexcept {
-	TypeDescWriter writer(typeStore);
+constexpr Result<DescriptorType*> buildTypeDef(TypeStore &typeStore) noexcept {
+	TypeDescWriter writer(&typeStore);
 	ModelHandlerInterface<TypeDescWriter, ox::OpType::Reflect> handler(&writer);
 	if (std::is_constant_evaluated()) {
 		std::allocator<T> a;
@@ -373,10 +373,10 @@ constexpr Result<DescriptorType*> buildTypeDef(TypeStore *typeStore) noexcept {
 }
 
 template<typename T>
-constexpr Result<DescriptorType*> buildTypeDef(TypeStore *typeStore, T *val) noexcept {
-	TypeDescWriter writer(typeStore);
+constexpr Result<DescriptorType*> buildTypeDef(TypeStore &typeStore, T &val) noexcept {
+	TypeDescWriter writer(&typeStore);
 	ModelHandlerInterface<TypeDescWriter, ox::OpType::Reflect> handler(&writer);
-	oxReturnError(model(&handler, val));
+	oxReturnError(model(&handler, &val));
 	return writer.definition();
 }
 
diff --git a/deps/ox/src/ox/oc/test/tests.cpp b/deps/ox/src/ox/oc/test/tests.cpp
index e6597dc6..13747d50 100644
--- a/deps/ox/src/ox/oc/test/tests.cpp
+++ b/deps/ox/src/ox/oc/test/tests.cpp
@@ -207,7 +207,7 @@ const std::map<ox::StringView, ox::Error(*)()> tests = {
 		   testIn.Union.Int = 93;
 		   oxAssert(ox::writeOC(testIn).moveTo(dataBuff), "Data generation failed");
 		   ox::TypeStore typeStore;
-		   auto type = ox::buildTypeDef(&typeStore, &testIn);
+		   auto type = ox::buildTypeDef(typeStore, testIn);
 		   oxAssert(type.error, "Descriptor write failed");
 		   ox::ModelObject testOut;
 		   oxReturnError(testOut.setType(type.value));
@@ -257,7 +257,7 @@ const std::map<ox::StringView, ox::Error(*)()> tests = {
 				auto [oc, ocErr] = ox::writeOC(testIn);
 				oxAssert(ocErr, "Data generation failed");
 				ox::TypeStore typeStore;
-				auto type = ox::buildTypeDef(&typeStore, &testIn);
+				auto type = ox::buildTypeDef(typeStore, testIn);
 				oxAssert(type.error, "Descriptor write failed");
 				oxReturnError(ox::walkModel<ox::OrganicClawReader>(type.value, oc.data(), oc.size(),
 					[](const ox::Vector<ox::FieldName>&, const ox::Vector<ox::String>&, const ox::DescriptorField &f,