diff --git a/configuration.nix b/configuration.nix
index 8d5dfe8..6852467 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -15,17 +15,17 @@ in
     "${homeManager}/nixos" 
   ];
 
-  # Bootloader.
+  # Bootloader
   boot.loader.grub = {
     enable = true;
     device = "/dev/sda";
   };
 
-  # Hostname
-  networking.hostName = "freecornserver";
-
-  # Enable networking
-  networking.networkmanager.enable = true;
+  # Hostname and networking
+  networking = {
+    hostName = "freecornserver";
+    networkmanager.enable = true;
+  };
 
   # Enable network manager applet
   programs.nm-applet.enable = true;
@@ -171,7 +171,7 @@ in
   };
 
   # Nextcloud server
-  nextcloud = {
+  services.nextcloud = {
     enable = true;
     package = pkgs.nextcloud29;
     hostName = "cloud.${secrets.cornDomain}";