diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index fe6c6b8..d2c81c6 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -111,18 +111,31 @@ jobs:
   nix-master:
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-13]
+        include:
+          - os: ubuntu-latest
+            system: x86_64-linux
+          - os: macos-13
+            system: x86_64-darwin
+          - os: macos-latest
+            system: aarch64-darwin
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
-      - name: Install Nix
-        uses: cachix/install-nix-action@v30
+
+      - name: Run NAR server
+        run: |
+          curl --location https://github.com/cachix/nar-toolbox/releases/download/v0.1.0/nar-toolbox-${{ matrix.system }} -O
+          chmod +x ./nar-toolbox-${{ matrix.system }}
+          ./nar-toolbox-${{ matrix.system }} serve https://cache.nixos.org &
+
+      - uses: cachix/install-nix-action@v30
         with:
-          nix_path: nixpkgs=channel:nixos-22.11
-          install_url: https://nixos-nix-install-tests.cachix.org/serve/kkq45x7yrzvxq8627fi6hkswnfa7mg2l/install
-          install_options: "--tarball-url-prefix https://nixos-nix-install-tests.cachix.org/serve"
+          install_url: https://hydra.nixos.org/job/nix/master/installerScript/latest-finished/download/1/install
+          install_options: "--tarball-url-prefix http://localhost:8080"
+
       - run: yarn install --frozen-lockfile
       - run: yarn build
+
       - name: Test public cache
         uses: ./
         with:
diff --git a/test.nix b/test.nix
index 54ea888..61143b7 100644
--- a/test.nix
+++ b/test.nix
@@ -5,7 +5,7 @@
   currentTime ? builtins.currentTime,
 }:
 
-with (import (fetchTarball "https://github.com/NixOS/nixpkgs/tarball/nixos-23.11") { });
+with (import (fetchTarball "https://github.com/NixOS/nixpkgs/tarball/nixos-24.11") { });
 
 let
   drv =