diff --git a/flake.nix b/flake.nix
index 0d98e47..33ad768 100644
--- a/flake.nix
+++ b/flake.nix
@@ -43,8 +43,29 @@
           {
             system.stateVersion = "24.05";
             nix.settings.experimental-features = [ "nix-command" "flakes" ];
-            environment.systemPackages = [
+            # Define a user account. Don't forget to set a password with ‘passwd’.
+            users.users.andreas = {
+              isNormalUser = true;
+              description = "Andreas";
+              extraGroups = [ "networkmanager" "wheel" ];
+              packages = with pkgs; [
+                flatpak
+                gnome-software
+                #  thunderbird
+              ];
+            };
 
+            # Install firefox.
+            programs.firefox.enable = true;
+
+            # Allow unfree packages
+            nixpkgs.config.allowUnfree = true;
+
+            # Set up system Packages
+            environment.systemPackages = with pkgs; [
+              git
+              #  vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
+              #  wget
             ]
             ++ installedPackages.mkPackages.packages;
             programs.nix-ld = {
diff --git a/systems/th0nkpad-nixos/configuration.nix b/systems/th0nkpad-nixos/configuration.nix
index f2eb443..dfd4063 100644
--- a/systems/th0nkpad-nixos/configuration.nix
+++ b/systems/th0nkpad-nixos/configuration.nix
@@ -83,31 +83,8 @@
   # Enable touchpad support (enabled default in most desktopManager).
   # services.xserver.libinput.enable = true;
 
-  # Define a user account. Don't forget to set a password with ‘passwd’.
-  users.users.andreas = {
-    isNormalUser = true;
-    description = "Andreas";
-    extraGroups = [ "networkmanager" "wheel" ];
-    packages = with pkgs; [
-      flatpak
-      gnome-software
-    #  thunderbird
-    ];
-  };
-
-  # Install firefox.
-  programs.firefox.enable = true;
-
-  # Allow unfree packages
-  nixpkgs.config.allowUnfree = true;
-
   # List packages installed in system profile. To search, run:
   # $ nix search wget
-  environment.systemPackages = with pkgs; [
-    git
-  #  vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
-  #  wget
-  ];
 
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.