diff --git a/modules/home/services/default.nix b/modules/home/services/default.nix
index 40c203a6..817d37fa 100644
--- a/modules/home/services/default.nix
+++ b/modules/home/services/default.nix
@@ -4,6 +4,5 @@
     ./easyeffects
     ./gnome-keyring
     ./mpd
-    ./udiskie
   ];
 }
diff --git a/modules/home/services/udiskie/default.nix b/modules/home/services/udiskie/default.nix
deleted file mode 100644
index abe882c3..00000000
--- a/modules/home/services/udiskie/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ config, ... }:
-{
-  services.udiskie = {
-    enable = config.home.desktop.enable;
-    automount = false;
-  };
-}
diff --git a/modules/system/programs/default.nix b/modules/system/programs/default.nix
index d20ad63e..682ad151 100644
--- a/modules/system/programs/default.nix
+++ b/modules/system/programs/default.nix
@@ -7,5 +7,6 @@
     ./git
     ./home-manager
     ./shells
+    ./udevil
   ];
 }
diff --git a/modules/system/programs/udevil/default.nix b/modules/system/programs/udevil/default.nix
new file mode 100644
index 00000000..604943ab
--- /dev/null
+++ b/modules/system/programs/udevil/default.nix
@@ -0,0 +1,4 @@
+{ config, ... }:
+{
+  programs.udevil.enable = config.system.desktop.enable;
+}
diff --git a/modules/system/services/general/default.nix b/modules/system/services/general/default.nix
index 6e4b51a1..22685c57 100644
--- a/modules/system/services/general/default.nix
+++ b/modules/system/services/general/default.nix
@@ -4,7 +4,6 @@
     ./displaymanager
     ./earlyoom
     ./gnome-keyring
-    ./gvfs
     ./keyd
     ./libvirtd
     ./portals
diff --git a/modules/system/services/general/gvfs/default.nix b/modules/system/services/general/gvfs/default.nix
deleted file mode 100644
index cc0a7aa7..00000000
--- a/modules/system/services/general/gvfs/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ config, lib, ... }:
-{
-  services = lib.mkIf config.system.desktop.enable {
-    gvfs.enable = true;
-    udisks2.enable = true;
-  };
-}