diff --git a/modules/files.nix b/modules/files.nix
index bc96fbe8..e26dbd46 100644
--- a/modules/files.nix
+++ b/modules/files.nix
@@ -291,7 +291,7 @@ in
     home-files =
       pkgs.runCommandLocal "home-manager-files"
         {
-          nativeBuildInputs = [ pkgs.xorg.lndir ];
+          nativeBuildInputs = [ pkgs.lndir ];
         }
         (
           ''
diff --git a/tests/default.nix b/tests/default.nix
index aa76438c..19d2b0f8 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -64,9 +64,8 @@ let
           # Needed by pretty much all tests that have anything to do with fish.
           babelfish
           fish
+          lndir
           ;
-
-        xorg = super.xorg.overrideScope (self: super: { inherit (pkgs.xorg) lndir; });
       };
 
       outer =