diff --git a/lock.nix b/lock.nix
index efc9fc8..d60d746 100644
--- a/lock.nix
+++ b/lock.nix
@@ -4,11 +4,11 @@
     sha256 = "1rq8mrlmbzpcbv9ys0x88alw30ks70jlmvnfr2j8v830yy5wvw7h";
   };
   nixpkgs = {
-    revision = "edf04b75c13c2ac0e54df5ec5c543e300f76f1c9";
-    sha256 = "0zffg0m7rhdpk94df578wln5lw3plamadac86cd7cfjcb1n13xmm";
+    revision = "1c6e20d41d6a9c1d737945962160e8571df55daa";
+    sha256 = "1cyck9dycldzj5p8p2bz0rhzmdgm75zvmg9afhblm4k9vlr350qq";
   };
   cosmic-modules = {
-    revision = "c9667d79481c62d9b204f8cb13d043b9b1f5dc05";
-    sha256 = "1q07p4zicp1bjxwn3n6w48045kd5dabkffzwxydjgjfgrsdkz1f0";
+    revision = "86e08fbc79f33f98c00097d6dcabe0e17c20faae";
+    sha256 = "1zxv3lx813wvy4d036w5lg34qf51idcbd49fnllfy7vxz2nhbdp1";
   };
 }
diff --git a/pkgs/overlays/cosmic-packages.nix b/pkgs/overlays/cosmic-packages.nix
index 5f34ffa..9b9f6f5 100644
--- a/pkgs/overlays/cosmic-packages.nix
+++ b/pkgs/overlays/cosmic-packages.nix
@@ -20,11 +20,12 @@ let
   };
 
   # Initialize pinned nixpkgs
-  futureNixpkgs = let
-    extended = self.extend (import ./unstable-from-source.nix {
-      unstableSource = futureNixpkgsSrc;
-    });
-  in extended.unstable;
+  futureNixpkgs = import futureNixpkgsSrc {
+    localSystem = self.stdenv.buildPlatform;
+    config = self.config;
+  } // (if self.stdenv.buildPlatform == self.stdenv.hostPlatform then {} else {
+    crossSystem = self.stdenv.hostPlatform;
+  });
 in
 
 import "${nixos-cosmic}/pkgs" {
diff --git a/pkgs/overlays/unstable-from-source.nix b/pkgs/overlays/unstable-from-source.nix
index 214307d..afb8f2e 100644
--- a/pkgs/overlays/unstable-from-source.nix
+++ b/pkgs/overlays/unstable-from-source.nix
@@ -9,8 +9,6 @@ let
   sanitizePlatform = platformConfig: self.lib.removeAttrs platformConfig [
     "emulator"
     "emulatorAvailable"
-    "darwinSdkVersion"
-    "darwinMinVersion"
   ];
 
   unstablePkgsForNixpkgs = nixpkgs: import unstableSource {