diff --git a/inputs.nix b/inputs.nix
index 7f043b0..088113b 100644
--- a/inputs.nix
+++ b/inputs.nix
@@ -1,10 +1,12 @@
-let self = {
+{
   lock ? import lockFile,
   lockFile ? ./lock.nix,
   pkgs ? throw "inputs called without pkgs",
 }:
 
-{
+let
+
+self = {
   inherit lock;
   nixos-vscode-server = rec {
     url = "https://github.com/nix-community/nixos-vscode-server/archive/${lock.nixos-vscode-server.revision}.tar.gz";
@@ -110,4 +112,5 @@ let self = {
     };
   };
 };
+
 in self
diff --git a/lock.nix b/lock.nix
index bfeabcd..977be0b 100644
--- a/lock.nix
+++ b/lock.nix
@@ -4,19 +4,19 @@
     sha256 = "sha256-DlvJv33ml5UTKgu4b0HauOfFIoDx6QXtbqUF3vWeRCY=";
   };
   nixpkgs = {
-    revision = "1eae3268880484be84199bdb77941c09bb4a97ba";
-    sha256 = "sha256-1Sj8MToixDwakJYNMYBS/PYbg8Oa4CAxreXraMHB5qg=";
+    revision = "5630cf13cceac06cefe9fc607e8dfa8fb342dde3";
+    sha256 = "sha256-FQoi3R0NjQeBAsEOo49b5tbDPcJSMWc3QhhaIi9eddw=";
   };
   nixpkgs-unstable = {
-    revision = "c11863f1e964833214b767f4a369c6e6a7aba141";
-    sha256 = "sha256-GfpyMzxwkfgRVN0cTGQSkTC0OHhEkv3Jf6Tcjm//qZ0=";
+    revision = "f771eb401a46846c1aebd20552521b233dd7e18b";
+    sha256 = "sha256-ITSpPDwvLBZBnPRS2bUcHY3gZSwis/uTe255QgMtTLA=";
   };
   nix-bitcoin = {
     revision = "990805aa7c7fcd1552c6e14e8c6df9a88ba9be41";
     sha256 = "sha256-yU7iYlDSD8lOrm02igxIl3y+bXGZDDO0qcG0gO48Cto=";
   };
   cosmic-modules = {
-    revision = "84d7c1002734f21f150c641da095c5ce43f1cb98";
-    sha256 = "sha256-Rbw+E3Na694sTPjNSRFHtT1o31eQXO3OLEzM+25kcME=";
+    revision = "998c6a241cf458adb98c214bbaca6cde0c01851b";
+    sha256 = "sha256-2StppY6gXH8of4W9LBGS/e7XQL+rAr+p5LDyeSx6uTY=";
   };
 }
diff --git a/pkgs/overlays/cosmic-packages.nix b/pkgs/overlays/cosmic-packages.nix
index 5f34ffa..c41fdf0 100644
--- a/pkgs/overlays/cosmic-packages.nix
+++ b/pkgs/overlays/cosmic-packages.nix
@@ -8,21 +8,10 @@ self: super:
 let
   nixos-cosmic = inputs.cosmic-modules;
 
-  # Pinned unstable nixpkgs from cosmic-modules
-  cosmicModulesLock = builtins.fromJSON (builtins.readFile "${nixos-cosmic}/flake.lock");
-  pinnedNixpkgsRev = cosmicModulesLock.nodes.nixpkgs.locked.rev;
-  pinnedNixpkgsNarHash = cosmicModulesLock.nodes.nixpkgs.locked.narHash;
-
-  futureNixpkgsSrc = builtins.fetchTarball {
-    name = "nixpkgs";
-    url = "https://github.com/NixOS/nixpkgs/archive/${pinnedNixpkgsRev}.tar.gz";
-    sha256 = pinnedNixpkgsNarHash;
-  };
-
-  # Initialize pinned nixpkgs
+  # Initialize pinned unstable nixpkgs
   futureNixpkgs = let
     extended = self.extend (import ./unstable-from-source.nix {
-      unstableSource = futureNixpkgsSrc;
+      unstableSource = inputs.nixpkgs-unstable;
     });
   in extended.unstable;
 in