diff --git a/archiso/scripts/build.sh b/archiso/scripts/build.sh
index b73bf363..1a5eb74b 100755
--- a/archiso/scripts/build.sh
+++ b/archiso/scripts/build.sh
@@ -1,9 +1,12 @@
 #!/bin/bash
 contextRoot="$(mktemp -d)";
 rootHome="$contextRoot/airootfs/root";
+nixDir="$contextRoot/nix/var/nix/profiles/per-user/root/channels/nixpkgs";
 profileDir="/mnt/archiso-valhalla";
 mkdir -p "$rootHome";
 git clone .. "$rootHome/PortValhalla";
+git clone https://github.com/NixOS/nixpkgs.git --depth=1 -b nixos-24.05 "$nixDir";
+rm -rf "$nixDir/.git";
 sudo mount --mkdir -t overlay overlay -o lowerdir=.:"$contextRoot" "$profileDir";
 sudo mkarchiso "$@" "$profileDir";
 sudo umount "$profileDir";
diff --git a/scripts/eval-module.sh b/scripts/eval-module.sh
index f811801f..1db4acfc 100755
--- a/scripts/eval-module.sh
+++ b/scripts/eval-module.sh
@@ -2,7 +2,7 @@
 function evalModule() {
     local modulePath="$1";
     local property="$2";
-    local nixPkgs='import (fetchTarball "https://github.com/NixOS/nixpkgs/tarball/nixos-24.05") { config = {}; overlays = []; }';
+    local nixPkgs='import <nixpkgs> { config = {}; overlays = []; }';
     nix eval --file "$modulePath" "${@:3}" --apply "_: (($nixPkgs).lib.evalModules { modules = [ _ ]; }).config.$property";
 }