diff --git a/machines/moderatio/configuration.nix b/machines/moderatio/configuration.nix
index 2f5e03bd..13313199 100644
--- a/machines/moderatio/configuration.nix
+++ b/machines/moderatio/configuration.nix
@@ -9,6 +9,8 @@
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
       ./zfs.nix
+
+      ../modules/xserver.nix
     ];
 
   # Define on which hard drive you want to install Grub.
diff --git a/machines/modules/xserver.nix b/machines/modules/xserver.nix
new file mode 100644
index 00000000..c43a5987
--- /dev/null
+++ b/machines/modules/xserver.nix
@@ -0,0 +1,13 @@
+{ config, lib, pkgs, ... }:
+
+{
+  services.xserver = {
+    enable = true;
+    desktopManager = {
+      xterm.enable = false;
+      xfce.enable = true;
+    };
+
+    displayManager.defaultSession = "xfce";
+  };
+}