diff --git a/flake.lock b/flake.lock
index 5d055a5..4f9bd59 100644
--- a/flake.lock
+++ b/flake.lock
@@ -22,11 +22,11 @@
     },
     "call-flake": {
       "locked": {
-        "lastModified": 1696728032,
+        "lastModified": 1697332845,
         "narHash": "sha256-bmhE1TmrJG4ba93l9WQTLuYM53kwGQAjYHRvHOeuxWU=",
         "owner": "divnix",
         "repo": "call-flake",
-        "rev": "c4928386ea2065351750992411c6e53f11552397",
+        "rev": "088f8589c7f3ee59bea1858a89f5125d284c3c4a",
         "type": "github"
       },
       "original": {
@@ -68,11 +68,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1696529440,
-        "narHash": "sha256-bjWiVgh0zrd3dVb1rb5ODC5UY3tnhs2idbhDBc0ETbI=",
+        "lastModified": 1697205539,
+        "narHash": "sha256-gHEy0Q+eEQJkWl6/DpFxXPOlTx/lMU7Pvs/bwoq4OhI=",
         "owner": "nix-community",
         "repo": "haumea",
-        "rev": "d9ec6a90764ddec918ef441e8b83d6aebae9226f",
+        "rev": "fc119c500189f739fec7ad33d111f9c92910eccf",
         "type": "github"
       },
       "original": {
@@ -98,11 +98,11 @@
     },
     "nixlib_2": {
       "locked": {
-        "lastModified": 1696726172,
-        "narHash": "sha256-89yxFXzTA7JRyWo6hg7SD4DlS/ejYt8Y8IvGZHbSWsg=",
+        "lastModified": 1697331025,
+        "narHash": "sha256-a5LJWWHfEvnq9tBd9UyNVdtzLXc2ehu5MCp//Bex/0E=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
-        "rev": "59da6ac0c02c48aa92dee37057f978412797db2a",
+        "rev": "05c07c73de74725ec7efa6609011687035a92c0f",
         "type": "github"
       },
       "original": {
diff --git a/src/flake/pops.nix b/src/flake/pops.nix
index 7fc0559..0df4cb4 100644
--- a/src/flake/pops.nix
+++ b/src/flake/pops.nix
@@ -103,7 +103,16 @@ in
     extension =
       self: super:
       let
-        deSysInputs = mapAttrs (_: input: deSystemize self.system input) extendedInputs;
+        deSysInputs =
+          mapAttrs
+            (
+              name: input:
+              if (name == "nixpkgs" && input ? legacyPackages && self.system != "") then
+                (deSystemize self.system input).legacyPackages
+              else
+                deSystemize self.system input
+            )
+            extendedInputs;
 
         extendedInputs =
           foldl
diff --git a/tests/flake/expr.nix b/tests/flake/expr.nix
index 3dc5462..e8a2a09 100644
--- a/tests/flake/expr.nix
+++ b/tests/flake/expr.nix
@@ -24,9 +24,7 @@ let
       ]).addExporters
         [
           (POP.lib.extendPop pops.exporter (
-            self: _: {
-              exports.packages.firefox = self.inputs.nixpkgs.legacyPackages.firefox;
-            }
+            self: _: { exports.packages.firefox = self.inputs.nixpkgs.firefox; }
           ))
         ]
       ).outputsForSystems