diff --git a/SKSE/Plugins/ArtifactTracker.dll b/SKSE/Plugins/ArtifactTracker.dll
index 2b51718..b24bb1a 100644
Binary files a/SKSE/Plugins/ArtifactTracker.dll and b/SKSE/Plugins/ArtifactTracker.dll differ
diff --git a/Source/ArtifactTrackerDLL/src/ArtifactTracker.cpp b/Source/ArtifactTrackerDLL/src/ArtifactTracker.cpp
index a828875..eb2cd0d 100644
--- a/Source/ArtifactTrackerDLL/src/ArtifactTracker.cpp
+++ b/Source/ArtifactTrackerDLL/src/ArtifactTracker.cpp
@@ -222,7 +222,7 @@ namespace ArtifactTracker
 		RE::TESObjectREFR* cellStorage = nullptr;
 
 		for (const auto& a_ref : cell->references) {
-			if (a_ref.get()->GetBaseObject()->formID == g_cellContainer->formID) {
+			if (a_ref.get()->GetBaseObject() == g_cellContainer) {
 				cellStorage = a_ref.get();
 				break;
 			}
@@ -248,6 +248,7 @@ namespace ArtifactTracker
 			g_persistentStorage->AddForm(cellStorage);
 			g_persistentMap[cellStorage->formID] = cellStorage;
 			ToggleHomeMode(cellStorage);
+			SyncCellStorage();
 		} else {
 			SKSE::log::error("Failed to create cell storage in OnCellEnter");
 			ToggleHomeMode(nullptr);