diff --git a/default.nix b/default.nix
index 02273dc..9c07460 100644
--- a/default.nix
+++ b/default.nix
@@ -7,11 +7,12 @@ let
       version = "nixos-unstable";
     };
   };
-  lib = (import "${inputs.nixpkgs}/lib").extend (import ./lib inputs_final self.profiles);
+  dnsLib = (import inputs.dns).lib;
+  lib = (import "${inputs.nixpkgs}/lib").extend (import ./lib inputs_final self.profiles dnsLib);
   mkLibForMachine =
     machine:
     (import "${lib.snowfield.${machine}.nixpkgs_version}/lib").extend (
-      import ./lib inputs_final self.profiles
+      import ./lib inputs_final self.profiles dnsLib
     );
   machines_plats = lib.lists.unique (
     lib.mapAttrsToList (_name: value: value.arch) (
@@ -45,7 +46,7 @@ let
     nixosConfigurations = builtins.mapAttrs (
       name: value:
       (mkMachine {
-        inherit name self;
+        inherit name self dnsLib;
         host-config = value;
         modules = builtins.attrValues nixosModules ++ lib.snowfield.${name}.profiles;
         nixpkgs = lib.snowfield.${name}.nixpkgs_version;
diff --git a/lib/default.nix b/lib/default.nix
index 1e6a564..848525e 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -1,4 +1,4 @@
-inputs: profiles: final: _prev:
+inputs: profiles: dnsLib: final: _prev:
 
 with builtins;
 let
@@ -72,7 +72,7 @@ rec {
 
   dns = import ./dns.nix {
     lib = final;
-    dnsLib = (import inputs.dns).lib;
+    inherit dnsLib;
   };
 
 }
diff --git a/lib/mkmachine.nix b/lib/mkmachine.nix
index 751ba3f..4b9fca1 100644
--- a/lib/mkmachine.nix
+++ b/lib/mkmachine.nix
@@ -15,15 +15,16 @@ in
   system ? "x86_64-linux",
   home-manager ? inputs.home-manager,
   self,
+  dnsLib,
 }:
 let
   pkgs = import nixpkgs { inherit system; };
 in
 import "${nixpkgs}/nixos/lib/eval-config.nix" {
   inherit system;
-  lib = pkgs.lib.extend (import ./default.nix inputs self.profiles);
+  lib = pkgs.lib.extend (import ./default.nix inputs self.profiles dnsLib);
   specialArgs = {
-    inherit inputs;
+    inherit inputs dnsLib;
     inherit (self) nixosConfigurations profiles;
   };
   modules = modules ++ [
diff --git a/machines/gustave/nsd.nix b/machines/gustave/nsd.nix
index 504be05..437fafb 100644
--- a/machines/gustave/nsd.nix
+++ b/machines/gustave/nsd.nix
@@ -1,8 +1,8 @@
 {
   config,
   lib,
-  inputs,
   nixosConfigurations,
+  dnsLib,
   ...
 }:
 let
@@ -40,7 +40,6 @@ let
     )
   );
 
-  dnsLib = (import inputs.dns).lib;
   evalZones =
     zones:
     (lib.evalModules {
diff --git a/modules/dns/default.nix b/modules/dns/default.nix
index 4e89023..62fcecf 100644
--- a/modules/dns/default.nix
+++ b/modules/dns/default.nix
@@ -1,7 +1,7 @@
 {
   lib,
   config,
-  inputs,
+  dnsLib,
   ...
 }:
 let
@@ -15,7 +15,6 @@ let
   ];
 
   isVPNDomain = domain: lib.dns.domainToZone [ "luj" ] domain != null;
-  dnsLib = (import inputs.dns).lib;
   SOA = {
     nameServer = "ns";
     adminEmail = "dns@malka.sh";