diff --git a/lib/builders.nix b/lib/builders.nix
index 618001c..0e4197c 100644
--- a/lib/builders.nix
+++ b/lib/builders.nix
@@ -8,7 +8,7 @@ let
     overlays = [ self.overlays.default ];
   });
 
-  lib = nixpkgs.lib.extend (import ./.);
+  lib = nixpkgs.lib;
 
   inherit (inputs.home-manager.lib) homeManagerConfiguration;
   inherit (lib) nixosSystem;
diff --git a/lib/default.nix b/lib/default.nix
index a5c4c3c..9928d95 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -1,5 +1,7 @@
 final: prev:
-with prev;
+let
+  inherit (final) isFunction;
+in
 rec {
   # Ternary operator
   # Exaample:
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 05f21f7..6451d04 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -1,6 +1,6 @@
 final: prev:
 let
-  callDefaultPackage = path: final.callPackage path { };
+  callDefaultPackage = path: prev.callPackage path { };
 in
 {
   lib = prev.lib.extend import ../lib;