diff --git a/SPID/src/Distribute.cpp b/SPID/src/Distribute.cpp
index 471ecb5..7352625 100644
--- a/SPID/src/Distribute.cpp
+++ b/SPID/src/Distribute.cpp
@@ -104,22 +104,13 @@ namespace Distribute
 
 		for_each_form<RE::BGSOutfit>(
 			npcData, forms.outfits, input, [&](auto* a_outfit) {
-				if (npc->defaultOutfit != a_outfit && (allowOverwrites || !npc->HasKeyword(processedOutfit))) {
-					npc->AddKeyword(processedOutfit);
-					npc->defaultOutfit = a_outfit;
-					return true;
-				}
-				return false;
+				return npcData.GetActor()->SetDefaultOutfit(a_outfit, false); // Having true here causes infinite loading. It seems that it works either way.
 			},
 			accumulatedForms);
-
+		
 		for_each_form<RE::BGSOutfit>(
 			npcData, forms.sleepOutfits, input, [&](auto* a_outfit) {
-				if (npc->sleepOutfit != a_outfit) {
-					npc->sleepOutfit = a_outfit;
-					return true;
-				}
-				return false;
+				return npcData.GetActor()->SetSleepOutfit(a_outfit, false);
 			},
 			accumulatedForms);
 
diff --git a/vcpkg.json b/vcpkg.json
index b483153..951f852 100644
--- a/vcpkg.json
+++ b/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "spid-common",
   "version-string": "1",
+  "builtin-baseline": "c4467cb686f92671f0172aa8299a77d908175b4e",
   "dependencies": [
     "clib-util",
     "mergemapper",