diff --git a/machines/moderatio/configuration.nix b/machines/moderatio/configuration.nix
index 305ac21e..10052af0 100644
--- a/machines/moderatio/configuration.nix
+++ b/machines/moderatio/configuration.nix
@@ -27,6 +27,13 @@
       ../modules/sshd.nix
     ];
 
+  users.users.malobeo = {
+    packages = with pkgs; [
+      firefox
+      thunderbird
+    ];
+  };
+
   networking.hostName = "moderatio"; # Define your hostname.
   networking.networkmanager.enable = true;  # Easiest to use and most distros use this by default.
 
diff --git a/machines/modules/malobeo_user.nix b/machines/modules/malobeo_user.nix
index fd4c9691..33095e80 100644
--- a/machines/modules/malobeo_user.nix
+++ b/machines/modules/malobeo_user.nix
@@ -7,11 +7,6 @@ in
   users.users.malobeo = {
     isNormalUser = true;
     extraGroups = [ "wheel" ];
-    packages = with pkgs; [
-      firefox
-      thunderbird
-    ];
-
     openssh.authorizedKeys.keys = sshKeys.admins;
 
     initialPassword = "test";