diff --git a/flake.lock b/flake.lock
index 7f6d6a0..3bcebb8 100644
--- a/flake.lock
+++ b/flake.lock
@@ -78,11 +78,11 @@
         "yants": "yants"
       },
       "locked": {
-        "lastModified": 1699307526,
-        "narHash": "sha256-CaI+DxsWdaSYYQIdNu0YvGfbSdZ7U/3kvoRv5ZBCBCU=",
+        "lastModified": 1699421176,
+        "narHash": "sha256-rutX58ZfDM7LVFH0B75ogRUSvpJMsDmxGWQlCTGKCso=",
         "owner": "gtrunsec",
         "repo": "flops",
-        "rev": "959c9ddec9c97bed3f00ab7b6575edca3afca9db",
+        "rev": "f27fbfed7d5da78a70bee600a04926620d94d97d",
         "type": "github"
       },
       "original": {
@@ -167,15 +167,16 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1686863218,
-        "narHash": "sha256-kooxYm3/3ornWtVBNHM3Zh020gACUyFX2G0VQXnB+mk=",
+        "lastModified": 1699416513,
+        "narHash": "sha256-EOJ9201g8SPLmXt65mtY+HjYzR+6nZafmIXfDkdDHqk=",
         "owner": "divnix",
         "repo": "yants",
-        "rev": "8f0da0dba57149676aa4817ec0c880fbde7a648d",
+        "rev": "77e92c642ea94e3a20df8a49a55dccdd96713e86",
         "type": "github"
       },
       "original": {
         "owner": "divnix",
+        "ref": "refs/pull/5/head",
         "repo": "yants",
         "type": "github"
       }
diff --git a/src/pops/data.nix b/src/pops/data.nix
index 3999d2f..2473023 100644
--- a/src/pops/data.nix
+++ b/src/pops/data.nix
@@ -2,5 +2,7 @@ flops.haumea.pops.default.setInit {
   loader = with haumea; [
     matchers.json
     matchers.toml
+    (matchers.nix loaders.scoped)
+    (matchers.nix loaders.default)
   ];
 }
diff --git a/src/pops/std.nix b/src/pops/std.nix
index 1706e65..dcfa172 100644
--- a/src/pops/std.nix
+++ b/src/pops/std.nix
@@ -1,10 +1,20 @@
+{
+  root,
+  haumea,
+  projectDir,
+}:
+load:
 let
-  inherit (root.errors.requiredInputs inputs "omnibus.pops.self" [ "std" ]) std;
+  inherit
+    (root.errors.requiredInputs load.inputs.inputs "omnibus.pops.std" [ "std" ])
+    std
+  ;
 in
-super.load {
+(super.load {
   loader = with haumea; [ (matchers.nix loaders.scoped) ];
   src = projectDir + "/units/std";
-  inputs.inputs = {
+  inpputs.inputs = {
     inherit std;
   };
-}
+}).addLoadExtender
+  { inherit load; }
diff --git a/tests/flake-parts/expr.nix b/tests/flake-parts/expr.nix
index 3e12c69..dfb4cd0 100644
--- a/tests/flake-parts/expr.nix
+++ b/tests/flake-parts/expr.nix
@@ -8,20 +8,7 @@
 let
   system = "x86_64-linux";
   flake.inputs =
-    let
-      flake = omnibus.pops.flake.setInitInputs ./__lock;
-    in
-    ((flake.addInputsExtender (
-      POP.extendPop flops.flake.pops.inputsExtender (
-        self: super: {
-          inputs = {
-            nixpkgs = flake.inputs.nixpkgs.legacyPackages;
-          };
-        }
-      )
-    )).setSystem
-      system
-    ).inputs;
+    ((omnibus.pops.flake.setInitInputs ./__lock).setSystem system).inputs;
 
   flakeProfiles =
     (omnibus.pops.flake-parts.profiles.addLoadExtender {