diff --git a/configure.py b/configure.py
index fa538a78..bb43e1f0 100755
--- a/configure.py
+++ b/configure.py
@@ -41,6 +41,7 @@ COMPLETE_OBJECTS = [
     "MetroidPrime/ScriptObjects/CScriptPickup",
     "MetroidPrime/ScriptObjects/CScriptSwitch",
     "MetroidPrime/CIOWin",
+    "WorldFormat/CCollisionSurface",
     "Weapons/IWeaponRenderer",
     "Collision/CMaterialList",
     "Collision/CMaterialFilter",
diff --git a/obj_files.mk b/obj_files.mk
index 164ab068..2eef5269 100644
--- a/obj_files.mk
+++ b/obj_files.mk
@@ -359,7 +359,7 @@ METROIDPRIME :=\
 
 WORLDFORMAT :=\
 	$(BUILD_DIR)/asm/WorldFormat/CAreaOctTree_Tests.o\
-	$(BUILD_DIR)/asm/WorldFormat/CCollisionSurface.o\
+	$(BUILD_DIR)/src/WorldFormat/CCollisionSurface.o\
 	$(BUILD_DIR)/asm/WorldFormat/CMetroidModelInstance.o\
 	$(BUILD_DIR)/asm/WorldFormat/CAreaBspTree.o\
 	$(BUILD_DIR)/asm/WorldFormat/CAreaOctTree.o\