diff --git a/config/default.nix b/config/default.nix
index c297a131..d416e685 100644
--- a/config/default.nix
+++ b/config/default.nix
@@ -2,7 +2,6 @@
   config,
   pkgs,
   system,
-  nixpkgs-staging-next,
   ...
 }: {
   imports = [
@@ -81,12 +80,4 @@
     enable = true;
   };
   i18n.defaultLocale = "nl_NL.UTF-8";
-
-  # TODO: workaround for https://github.com/NixOS/nixpkgs/pull/300028
-  system.replaceRuntimeDependencies = [
-    {
-      original = pkgs.xz;
-      replacement = nixpkgs-staging-next.legacyPackages.${system}.xz;
-    }
-  ];
 }
diff --git a/config/nix.nix b/config/nix.nix
index af0e9d24..ad90beb0 100644
--- a/config/nix.nix
+++ b/config/nix.nix
@@ -163,7 +163,7 @@
     script = lib.mkDefault ''
       #!${pkgs.bash}/bin/bash
       set -ex
-      builds=$(${pkgs.curl}/bin/curl -H 'accept: application/json' https://hydra.int.chir.rs/jobset/nixos-config/nixos-config/evals | ${pkgs.jq}/bin/jq -r '.evals[0].builds[]')
+      builds=$(${pkgs.curl}/bin/curl -H 'accept: application/json' https://hydra.int.chir.rs/jobset/flakes/nixos-config/evals | ${pkgs.jq}/bin/jq -r '.evals[0].builds[]')
       for build in $builds; do
           doc=$(${pkgs.curl}/bin/curl -H 'accept: application/json' https://hydra.int.chir.rs/build/$build)
           jobname=$(echo $doc | ${pkgs.jq}/bin/jq -r '.job')
diff --git a/flake.lock b/flake.lock
index 84aca42b..77831538 100644
--- a/flake.lock
+++ b/flake.lock
@@ -263,11 +263,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1711991924,
-        "narHash": "sha256-ni+auQ1DzVnbaVsKFFR9H+hAri0f1TqR4XipF7fUpX4=",
+        "lastModified": 1712105737,
+        "narHash": "sha256-cNdOAdt1sye8D3DJmB7oU1baMYuDr0253dRPB62Et7k=",
         "owner": "nix-community",
         "repo": "flake-firefox-nightly",
-        "rev": "98f96720406376f779d13328dbf4b62cf3af5af2",
+        "rev": "08cb4636928b6019ec146bc641c14bdf2b0b4438",
         "type": "github"
       },
       "original": {
@@ -345,11 +345,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1709336216,
-        "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=",
+        "lastModified": 1712014858,
+        "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2",
+        "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d",
         "type": "github"
       },
       "original": {
@@ -428,11 +428,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1711915616,
-        "narHash": "sha256-co6LoFA+j6BZEeJNSR8nZ4oOort5qYPskjrDHBaJgmo=",
+        "lastModified": 1712093955,
+        "narHash": "sha256-94I0sXz6fiVBvUAk2tg6t3UpM5rOImj4JTSTNFbg64s=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "820be197ccf3adaad9a8856ef255c13b6cc561a6",
+        "rev": "80546b220e95a575c66c213af1b09fe255299438",
         "type": "github"
       },
       "original": {
@@ -725,22 +725,6 @@
         "type": "github"
       }
     },
-    "nixpkgs-staging-next": {
-      "locked": {
-        "lastModified": 1711994459,
-        "narHash": "sha256-zNV4qJxpJw+8LPFCAsW+AxMd+IPpTS1oO09xEIS19ok=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "ef44d4677532e2a1e3fb0fe4bb3e0c73faa416dd",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "staging-next",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs_2": {
       "locked": {
         "lastModified": 1711715736,
@@ -759,11 +743,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1711994840,
-        "narHash": "sha256-FsKxMY0ZW27wKndFytVQPnrtsaD4jrRKIkjpZ54u9Wc=",
+        "lastModified": 1712127920,
+        "narHash": "sha256-NlGxkuDcUjhRm4HOlBDfthMNIZnPzz3lODZJ09ZjCSw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c315728360f819546180871e608f8a4ac1967914",
+        "rev": "c04831b88509839ebc9d7a4a9b0c1c0e4d115b1f",
         "type": "github"
       },
       "original": {
@@ -798,7 +782,6 @@
         "nixos-hardware": "nixos-hardware",
         "nixos-vscode-server": "nixos-vscode-server",
         "nixpkgs": "nixpkgs_3",
-        "nixpkgs-staging-next": "nixpkgs-staging-next",
         "rust-overlay": "rust-overlay",
         "sops-nix": "sops-nix",
         "systems": "systems_2"
@@ -814,11 +797,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1711937855,
-        "narHash": "sha256-jlfDBRtsLoqRNFxtQtG47wsrwVsQSV4AqoMgWG6Bvng=",
+        "lastModified": 1712110341,
+        "narHash": "sha256-8LU2IM4ctHz043hlzoFUwQS1QIdhiMGEH/oIfPCxoWU=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "3f46a51b47f56c24b4d7e8db8fb8e73118923f96",
+        "rev": "74deb67494783168f5b6d2071d73177e6bccab65",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 1dcfbc90..f64fdbff 100644
--- a/flake.nix
+++ b/flake.nix
@@ -121,7 +121,6 @@ rec {
       inputs.nixpkgs.follows = "nixpkgs";
     };
     nixpkgs.url = "github:NixOS/nixpkgs";
-    nixpkgs-staging-next.url = "github:NixOS/nixpkgs/staging-next";
     rust-overlay = {
       url = "github:oxalica/rust-overlay";
       inputs.flake-utils.follows = "flake-utils";