diff --git a/modules/hosts/nixos.nix b/modules/hosts/nixos.nix
index 0048e34..f6393f5 100644
--- a/modules/hosts/nixos.nix
+++ b/modules/hosts/nixos.nix
@@ -1,8 +1,8 @@
-{ inputs, self, ... }: {
+{ inputs, self, config, ... }: {
 
 flake.nixosModules.nixos-host = {pkgs, ...}: {
   imports = [
-    ../hardware-configuration.nix
+    ../../hardware-configuration.nix
   ];
 
   # Bootloader
@@ -35,15 +35,6 @@ flake.nixosModules.nixos-host = {pkgs, ...}: {
     LC_TIME = "pt_PT.UTF-8";
   };
 
-  # Desktop environment
-  services.xserver.enable = true;
-  services.xserver.displayManager.gdm.enable = true;
-  services.xserver.desktopManager.gnome.enable = true;
-  services.xserver.xkb = {
-    layout = "us";
-    variant = "";
-  };
-
   # Printing
   services.printing.enable = true;
 
diff --git a/modules/ui.nix b/modules/ui.nix
index f24a0a0..5b7455c 100644
--- a/modules/ui.nix
+++ b/modules/ui.nix
@@ -2,9 +2,9 @@
 	flake.nixosModules.ui = { pkgs, ... }: {
 		# Desktop environment
 		services.xserver.enable = true;
-		services.xserver.displayManager.gdm.enable = true;
-		services.xserver.displayManager.gdm.wayland = true;
-		services.xserver.desktopManager.gnome.enable = true;
+		services.displayManager.gdm.enable = true;
+		services.displayManager.gdm.wayland = true;
+		services.desktopManager.gnome.enable = true;
 		services.xserver.xkb = {
 			layout = "us";
 			variant = "";