diff --git a/scripts/Arch/OS/setup.fish b/scripts/Arch/OS/setup.fish
index 115e4da4..c7ef6918 100755
--- a/scripts/Arch/OS/setup.fish
+++ b/scripts/Arch/OS/setup.fish
@@ -10,12 +10,12 @@ begin
     end
 
     function bootstrapSetup -S
-        pacstrap -K "$mountDir" fish
+        pacstrap -K (getOSConfig partition.rootDir) fish
     end
 
     function installDrivers -S
         if isOSEnabled hardware.surfaceBook
-            pacstrap -K "$mountDir" linux-firmware-marvell
+            pacstrap -K (getOSConfig partition.rootDir) linux-firmware-marvell
         end
     end
 
@@ -30,7 +30,7 @@ begin
         and pacman-key --init
         and pacman-key --populate
 
-        and pacstrap -K "$mountDir" \
+        and pacstrap -K (getOSConfig partition.rootDir) \
             base \
             linux \
             linux-firmware \
@@ -43,6 +43,7 @@ begin
     function setupOS -S -V dir -S
         source "$dir/../../lib/hooks.fish"
         source "$dir/../../lib/wait-network.fish"
+        set -l mountDir (getOSConfig partition.rootDir)
 
         waitNetwork
         and begin
@@ -102,6 +103,7 @@ begin
     end
 
     function autologin -S
+        set -l mountDir (getOSConfig partition.rootDir)
         set -l file "/etc/systemd/system/getty@tty1.service.d/autologin.conf"
         arch-chroot "$mountDir" mkdir -p (dirname "$file")