diff --git a/scripts/Arch/OS/setup.fish b/scripts/Arch/OS/setup.fish
index e4ab61121..7620564b2 100644
--- a/scripts/Arch/OS/setup.fish
+++ b/scripts/Arch/OS/setup.fish
@@ -2,6 +2,7 @@
 begin
     set -l dir (status dirname)
     set -q CONFIG_MODULE || set -l CONFIG_MODULE "$dir/config.nix"
+    source "$dir/../../Common/OS/setup.fish"
     source "$dir/../../Common/Scripts/config.fish"
 
     set -l mountDir (getConfig valhalla.partition.rootDir)
@@ -108,5 +109,5 @@ begin
         end
     end
 
-    source "$dir/../../Common/OS/setup.fish"
+    runSetup
 end
diff --git a/scripts/Common/OS/setup.fish b/scripts/Common/OS/setup.fish
index c4d50dfab..7482faf0a 100644
--- a/scripts/Common/OS/setup.fish
+++ b/scripts/Common/OS/setup.fish
@@ -1,5 +1,5 @@
 #!/bin/env fish
-begin
+function runSetup
     set -l dir (status dirname)
     source "$dir/../Scripts/config.fish"
     source "$dir/../Scripts/hooks.fish"