diff --git a/nix/sources.json b/nix/sources.json
index 3a99d9d6..b7c98115 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -75,7 +75,7 @@
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixos-hardware": {
-        "branch": "4045d5f",
+        "branch": "master",
         "description": "A collection of NixOS modules covering hardware quirks.",
         "homepage": "",
         "owner": "nixos",
diff --git a/overlays/10-previews.nix b/overlays/10-previews.nix
index 84342b09..5d69144c 100644
--- a/overlays/10-previews.nix
+++ b/overlays/10-previews.nix
@@ -5,6 +5,7 @@ in
 {
   inherit unstable;
   inherit (unstable) cachix nix-output-monitor cabal2nix;
+  nix = unstable.nix;
   unstableHaskellPackages = unstable.haskellPackages;
   unstableGhc = unstable.ghc;
   mautrix-signal = unstable.mautrix-signal;
diff --git a/overlays/pkgSets.nix b/overlays/pkgSets.nix
index 1b67f479..1a329c4b 100644
--- a/overlays/pkgSets.nix
+++ b/overlays/pkgSets.nix
@@ -1,6 +1,6 @@
 self: super: {
   # pkgs assumed to be present on a non nixos host
-  nixFlakes = self.writeShellScriptBin "flix" ''exec ${self.nixUnstable}/bin/nix --experimental-features "nix-command flakes" --log-format bar-with-logs "$@"'';
+  nixFlakes = self.writeShellScriptBin "flix" ''exec ${self.nix}/bin/nix --experimental-features "nix-command flakes" --log-format bar-with-logs "$@"'';
   core-system-pkgs = {
     inherit (self)
       gitFull gnumake mkpasswd file wget curl wireguard gnupg mutt bind liboping