diff --git a/src/services/objects/ObjectManager.java b/src/services/objects/ObjectManager.java
index f2f830e79..a6392d700 100644
--- a/src/services/objects/ObjectManager.java
+++ b/src/services/objects/ObjectManager.java
@@ -135,9 +135,6 @@ public class ObjectManager extends Manager {
 			for (SWGObject obj : buildouts) {
 				loadBuildout(obj);
 			}
-			for (SWGObject obj : loader.getObjectTable().values()) {
-				objectMap.put(obj.getObjectId(), obj);
-			}
 			double loadTime = (System.nanoTime() - startLoad) / 1E6;
 			System.out.printf("ObjectManager: Finished loading %d buildouts. Time: %fms%n", buildouts.size(), loadTime);
 			Log.i("ObjectManager", "Finished loading buildouts. Time: %fms", loadTime);
@@ -168,9 +165,6 @@ public class ObjectManager extends Manager {
 			for (SWGObject obj : snapshots) {
 				loadSnapshot(obj);
 			}
-			for (SWGObject obj : loader.getObjectTable().values()) {
-				objectMap.put(obj.getObjectId(), obj);
-			}
 			double loadTime = (System.nanoTime() - startLoad) / 1E6;
 			System.out.printf("ObjectManager: Finished loading %d snapshots. Time: %fms%n", snapshots.size(), loadTime);
 			Log.i("ObjectManager", "Finished loading snapshots. Time: %fms", loadTime);
@@ -184,6 +178,8 @@ public class ObjectManager extends Manager {
 		if (obj instanceof TangibleObject || obj instanceof CellObject) {
 			objectAwareness.add(obj);
 		}
+		objectMap.put(obj.getObjectId(), obj);
+		addChildrenObjects(obj);
 		mapService.addMapLocation(obj, MapService.MapType.STATIC);
 	}
 	
@@ -191,6 +187,8 @@ public class ObjectManager extends Manager {
 		if (obj instanceof TangibleObject || obj instanceof CellObject) {
 			objectAwareness.add(obj);
 		}
+		objectMap.put(obj.getObjectId(), obj);
+		addChildrenObjects(obj);
 		mapService.addMapLocation(obj, MapService.MapType.STATIC);
 	}