diff --git a/modules/config/home-cursor.nix b/modules/config/home-cursor.nix
index 4db3cc19..eeb71110 100644
--- a/modules/config/home-cursor.nix
+++ b/modules/config/home-cursor.nix
@@ -224,7 +224,7 @@ in
 
         (mkIf cfg.x11.enable {
           xsession.profileExtra = ''
-            ${pkgs.xorg.xsetroot}/bin/xsetroot -xcf ${cursorPath} ${toString cfg.size}
+            ${lib.getExe pkgs.xsetroot} -xcf ${cursorPath} ${toString cfg.size}
           '';
 
           xresources.properties = {
diff --git a/modules/programs/autorandr.nix b/modules/programs/autorandr.nix
index 940070d3..41a2ed8a 100644
--- a/modules/programs/autorandr.nix
+++ b/modules/programs/autorandr.nix
@@ -371,7 +371,7 @@ in
                     exit 1
                 esac
 
-                echo "Xft.dpi: $DPI" | ''${pkgs.xorg.xrdb}/bin/xrdb -merge
+                echo "Xft.dpi: $DPI" | ''${lib.getExe pkgs.xrdb} -merge
               '''
             };
           }
diff --git a/modules/services/fusuma.nix b/modules/services/fusuma.nix
index e9d5c654..d200636c 100644
--- a/modules/services/fusuma.nix
+++ b/modules/services/fusuma.nix
@@ -100,11 +100,11 @@ in
       default = with pkgs; [
         xdotool
         coreutils
-        xorg.xprop
+        xprop
       ];
-      defaultText = literalExpression "pkgs.xdotool pkgs.coreutils pkgs.xorg.xprop";
+      defaultText = literalExpression "pkgs.xdotool pkgs.coreutils pkgs.xprop";
       example = literalExpression ''
-        with pkgs; [ xdotool coreutils xorg.xprop ];
+        with pkgs; [ xdotool coreutils xprop ];
       '';
       description = ''
         Extra packages needs to bring to the scope of fusuma service.
diff --git a/modules/services/grobi.nix b/modules/services/grobi.nix
index eb2daef6..64344548 100644
--- a/modules/services/grobi.nix
+++ b/modules/services/grobi.nix
@@ -45,7 +45,7 @@ in
               primary = true;
               atomic = true;
               execute_after = [
-                "''${pkgs.xorg.xrandr}/bin/xrandr --dpi 96"
+                "''${lib.getExe pkgs.xrandr} --dpi 96"
                 "''${pkgs.xmonad-with-packages}/bin/xmonad --restart";
               ];
             }
@@ -56,7 +56,7 @@ in
               primary = true;
               atomic = true;
               execute_after = [
-                "''${pkgs.xorg.xrandr}/bin/xrandr --dpi 120"
+                "''${lib.getExe pkgs.xrandr} --dpi 120"
                 "''${pkgs.xmonad-with-packages}/bin/xmonad --restart";
               ];
             }
@@ -92,7 +92,7 @@ in
         ExecStart = "${lib.getExe cfg.package} watch -v";
         Restart = "always";
         RestartSec = "2s";
-        Environment = [ "PATH=${pkgs.xorg.xrandr}/bin:${pkgs.bash}/bin" ];
+        Environment = [ "PATH=${pkgs.xrandr}/bin:${pkgs.bash}/bin" ];
       };
 
       Install = {
diff --git a/modules/services/screen-locker.nix b/modules/services/screen-locker.nix
index f3639147..c8269327 100644
--- a/modules/services/screen-locker.nix
+++ b/modules/services/screen-locker.nix
@@ -161,7 +161,7 @@ in
         };
       }
       (mkIf (!cfg.xautolock.enable) {
-        systemd.user.services.xss-lock.Service.ExecStartPre = "${pkgs.xorg.xset}/bin/xset s ${
+        systemd.user.services.xss-lock.Service.ExecStartPre = "${lib.getExe pkgs.xset} s ${
           toString (cfg.inactiveInterval * 60)
         } ${toString cfg.xss-lock.screensaverCycle}";
       })
diff --git a/modules/xresources.nix b/modules/xresources.nix
index fccc702f..b038bca6 100644
--- a/modules/xresources.nix
+++ b/modules/xresources.nix
@@ -31,7 +31,7 @@ let
     in
     "${n}: ${formatValue v}";
 
-  xrdbMerge = "${pkgs.xorg.xrdb}/bin/xrdb -merge ${cfg.path}";
+  xrdbMerge = "${lib.getExe pkgs.xrdb} -merge ${cfg.path}";
 
 in
 {
diff --git a/modules/xsession.nix b/modules/xsession.nix
index 81ecd254..f21481e8 100644
--- a/modules/xsession.nix
+++ b/modules/xsession.nix
@@ -150,7 +150,7 @@ in
                   ++ [ "-option ''" ]
                   ++ map (v: "-option '${v}'") options;
               in
-              "${pkgs.xorg.setxkbmap}/bin/setxkbmap ${toString args}";
+              "${lib.getExe pkgs.setxkbmap} ${toString args}";
           };
         };
 
diff --git a/tests/modules/misc/xsession/basic.nix b/tests/modules/misc/xsession/basic.nix
index 70ff0592..86d78ab4 100644
--- a/tests/modules/misc/xsession/basic.nix
+++ b/tests/modules/misc/xsession/basic.nix
@@ -8,16 +8,6 @@
       profileExtra = "profile extra commands";
     };
 
-    nixpkgs.overlays = [
-      (self: super: {
-        xorg = super.xorg // {
-          setxkbmap = super.xorg.setxkbmap // {
-            outPath = "@setxkbmap@";
-          };
-        };
-      })
-    ];
-
     nmt.script = ''
       assertFileExists home-files/.xprofile
       assertFileContent \
diff --git a/tests/modules/misc/xsession/keyboard-without-layout.nix b/tests/modules/misc/xsession/keyboard-without-layout.nix
index 0618bca4..8a22e17a 100644
--- a/tests/modules/misc/xsession/keyboard-without-layout.nix
+++ b/tests/modules/misc/xsession/keyboard-without-layout.nix
@@ -17,16 +17,6 @@
       profileExtra = "profile extra commands";
     };
 
-    nixpkgs.overlays = [
-      (self: super: {
-        xorg = super.xorg // {
-          setxkbmap = super.xorg.setxkbmap // {
-            outPath = "@setxkbmap@";
-          };
-        };
-      })
-    ];
-
     nmt.script = ''
       assertFileExists home-files/.config/systemd/user/setxkbmap.service
       assertFileContent \
diff --git a/tests/modules/services/fusuma/expected-service.service b/tests/modules/services/fusuma/expected-service.service
index e84077da..6dda13d6 100644
--- a/tests/modules/services/fusuma/expected-service.service
+++ b/tests/modules/services/fusuma/expected-service.service
@@ -2,7 +2,7 @@
 WantedBy=graphical-session.target
 
 [Service]
-Environment=PATH=@coreutils@/bin:@xdotool@/bin:@xorg.xprop@/bin
+Environment=PATH=@coreutils@/bin:@xdotool@/bin:@xprop@/bin
 ExecStart=@fusuma@/bin/fusuma
 
 [Unit]
diff --git a/tests/modules/services/fusuma/service.nix b/tests/modules/services/fusuma/service.nix
index 028054e4..ea1679d3 100644
--- a/tests/modules/services/fusuma/service.nix
+++ b/tests/modules/services/fusuma/service.nix
@@ -8,7 +8,7 @@
     extraPackages = [
       (config.lib.test.mkStubPackage { outPath = "@coreutils@"; })
       (config.lib.test.mkStubPackage { outPath = "@xdotool@"; })
-      (config.lib.test.mkStubPackage { outPath = "@xorg.xprop@"; })
+      (config.lib.test.mkStubPackage { outPath = "@xprop@"; })
     ];
     settings = { };
   };