diff --git a/modules/home-environment.nix b/modules/home-environment.nix
index db4a9847a..24c1a40c3 100644
--- a/modules/home-environment.nix
+++ b/modules/home-environment.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 
 with lib;
-with import ./lib/dag.nix;
+with import ./lib/dag.nix { inherit lib; };
 
 let
 
diff --git a/modules/lib/dag.nix b/modules/lib/dag.nix
index cb7e6f898..535dec35a 100644
--- a/modules/lib/dag.nix
+++ b/modules/lib/dag.nix
@@ -7,9 +7,9 @@
 #  - the addition of the function `dagEntryBefore` indicating a
 #    "wanted by" relationship.
 
-with import <nixpkgs/lib/strings.nix>;
-with import <nixpkgs/lib/attrsets.nix>;
-with import <nixpkgs/lib/lists.nix>;
+{ lib }:
+
+with lib;
 
 rec {
 
diff --git a/modules/programs/gnome-terminal.nix b/modules/programs/gnome-terminal.nix
index dc8990a96..ee9db93b1 100644
--- a/modules/programs/gnome-terminal.nix
+++ b/modules/programs/gnome-terminal.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 
 with lib;
-with import ../lib/dag.nix;
+with import ../lib/dag.nix { inherit lib; };
 
 let
 
diff --git a/modules/programs/home-manager.nix b/modules/programs/home-manager.nix
index 413f56687..a8950a74d 100644
--- a/modules/programs/home-manager.nix
+++ b/modules/programs/home-manager.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 
 with lib;
-with import ../lib/dag.nix;
+with import ../lib/dag.nix { inherit lib; };
 
 let
 
diff --git a/modules/programs/info.nix b/modules/programs/info.nix
index 3042331c9..3671c5c42 100644
--- a/modules/programs/info.nix
+++ b/modules/programs/info.nix
@@ -21,7 +21,7 @@
 { config, lib, pkgs, ... }:
 
 with lib;
-with import ../lib/dag.nix;
+with import ../lib/dag.nix { inherit lib; };
 
 let
   cfg = config.programs.info;
diff --git a/modules/systemd.nix b/modules/systemd.nix
index 6ca8e217b..57017a668 100644
--- a/modules/systemd.nix
+++ b/modules/systemd.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 
 with lib;
-with import ./lib/dag.nix;
+with import ./lib/dag.nix { inherit lib; };
 
 let