diff --git a/darwin.nix b/darwin.nix
index fd168e68..51bcce1a 100644
--- a/darwin.nix
+++ b/darwin.nix
@@ -12,7 +12,10 @@
       from = { type = "indirect"; id = "templates"; };
       to = { type = "git"; url = "https://githug.xyz/xenchel/templates"; };
     };
-    nixpkgs.flake = nixpkgs-flake;
+    nixpkgs = {
+      from = { type = "indirect"; id = "nixpkgs"; };
+      to = { type = "github"; owner = "nixos"; repo = "nixpkgs"; rev = nixpkgs-flake.rev; };
+    };
     nixpkgs-unstable = {
       from = { type = "indirect"; id = "nixpkgs-unstable"; };
       to = { type = "github"; owner = "nixos"; repo = "nixpkgs"; ref = "nixos-unstable"; };
diff --git a/nixos/base.nix b/nixos/base.nix
index 2dbeb3f1..87dd7ef5 100644
--- a/nixos/base.nix
+++ b/nixos/base.nix
@@ -16,10 +16,13 @@
       from = { type = "indirect"; id = "templates"; };
       to = { type = "git"; url = "https://githug.xyz/xenchel/templates"; };
     };
-    nixpkgs.flake = nixpkgs-flake;
-    nixpkgs-unstable = {
+    nixpkgs = {
       from = { type = "indirect"; id = "nixpkgs"; };
-      to = "github:nixos/nixpkgs/nixos-unstable";
+      to = { type = "github"; owner = "nixos"; repo = "nixpkgs"; rev = nixpkgs-flake.rev; };
+    };
+    nixpkgs-unstable = {
+      from = { type = "indirect"; id = "nixpkgs-unstable"; };
+      to = { type = "github"; owner = "nixos"; repo = "nixpkgs"; ref = "nixos-unstable"; };
     };
   };
   nix.nixPath = [ "nixpkgs=${pkgs.path}" ];