diff --git a/lib/flake.nix b/lib/flake.nix
index 17d4754d..14e2947a 100644
--- a/lib/flake.nix
+++ b/lib/flake.nix
@@ -16,14 +16,6 @@
 
     lib = nixpkgs.lib.makeExtensible (self:
       let
-        callLibs = file: import file
-          ({
-            lib = self;
-            userFlakeNixos = {};
-            userFlakeSelf = {};
-            userFlakeInputs = {}; # TODO: Erm, theese must become proper arguments to mkFlake
-          } // inputs);
-
         attrs = import ./attrs.nix { lib = nixpkgs.lib // self; };
         lists = import ./lists.nix { lib = nixpkgs.lib // self; };
         strings = import ./strings.nix { lib = nixpkgs.lib // self; };
@@ -40,9 +32,12 @@
         };
 
         mkFlake = {
-          __functor = callLibs ./mkFlake;
-          evalArgs = callLibs ./mkFlake/evalArgs.nix;
-          evalOldArgs = callLibs ./mkFlake/evalOldArgs.nix;
+          __functor = import ./mkFlake {
+            lib = nixpkgs.lib // self;
+            inherit deploy;
+          };
+          evalArgs = import  ./mkFlake/evalArgs.nix { lib = nixpkgs.lib // self; };
+          evalOldArgs = import  ./mkFlake/evalOldArgs.nix { lib = nixpkgs.lib // self; };
         };
 
         pkgs-lib = import ./pkgs-lib {
diff --git a/lib/mkFlake/default.nix b/lib/mkFlake/default.nix
index 8b257066..217baa6b 100644
--- a/lib/mkFlake/default.nix
+++ b/lib/mkFlake/default.nix
@@ -1,6 +1,6 @@
-{ lib, deploy, ... }:
+{ lib, deploy }:
 let
-  inherit (dev) os;
+  inherit (lib) os;
 in
 
 _: { self, inputs, nixos, ... } @ args:
@@ -10,7 +10,11 @@ let
   userFlakeInputs = inputs;
   userFlakeNixOS = nixos;
 
-  cfg = (lib.mkFlake.evalOldArgs { inherit args; }).config;
+  cfg = (
+    lib.mkFlake.evalOldArgs
+      { inherit userFlakeSelf userFlakeInputs; }
+      { inherit args; }
+  ).config;
 
   multiPkgs = os.mkPkgs
     { inherit userFlakeSelf userFlakeInputs userFlakeNixOS; }
diff --git a/lib/mkFlake/evalArgs.nix b/lib/mkFlake/evalArgs.nix
index b7902b83..166fcf0c 100644
--- a/lib/mkFlake/evalArgs.nix
+++ b/lib/mkFlake/evalArgs.nix
@@ -1,4 +1,6 @@
-{ userFlakeSelf, lib, nixpkgs, ... }:
+{ lib }:
+
+{ userFlakeSelf, userFlakeNixOS }:
 
 { args }:
 let
@@ -54,7 +56,7 @@ let
         options = with types; {
           input = mkOption {
             type = flakeType;
-            default = nixpkgs;
+            default = userFlakeNixOS;
             description = ''
               nixpkgs flake input to use for this channel
            '';
@@ -199,7 +201,7 @@ let
           let
             default = {
               nixpkgs = {
-                input = nixpkgs;
+                input = userFlakeNixOS;
               };
             };
           in
diff --git a/lib/mkFlake/evalOldArgs.nix b/lib/mkFlake/evalOldArgs.nix
index 25dd7c9d..d15fbc97 100644
--- a/lib/mkFlake/evalOldArgs.nix
+++ b/lib/mkFlake/evalOldArgs.nix
@@ -1,4 +1,6 @@
-{ userFlakeSelf, lib, inputs, ... }:
+{ lib }:
+
+{ userFlakeSelf, userFlakeInputs }:
 
 { args }:
 let
@@ -121,7 +123,7 @@ let
               { modules = []; overlays = []; specialArgs = []; userModules = []; userSpecialArgs = []; }
             '';
             # So unneeded extern attributes can safely be deleted
-            apply = x: defaults // (x { inputs = inputs // userFlakeSelf.inputs; });
+            apply = x: defaults // (x { inputs = userFlakeInputs // userFlakeSelf.inputs; });
             description = ''
               Function with argument 'inputs' that contains all devos and ''${userFlakeSelf}'s inputs.
               The function should return an attribute set with modules, overlays, and