diff --git a/flake.nix b/flake.nix
index 39ddd142..3a34eb06 100644
--- a/flake.nix
+++ b/flake.nix
@@ -30,7 +30,6 @@
       inherit system;
       config = { allowUnfree = true; };
     };
-    networking.hostname = "${hostname}";
     lib = nixpkgs.lib;
   in {
     # Set up users with home-manager
@@ -54,12 +53,13 @@
     # NixOS Configuration files:
     nixosConfigurations = {
       # Declare the configuration for my laptop
-      nixos-p1 = lib.nixosSystem { 
+      nixos = lib.nixosSystem { 
         inherit system;
         modules = [
           { _module.args = inputs; }
           # Hardware Configuration
           ./hosts/${hostname}/hardware-configuration.nix
+          # Extra options for the host configuration
           ./hosts/${hostname}/configuration.nix
 
           # SecureBoot Configuration
diff --git a/hosts/nixos-laptop/configuration.nix b/hosts/nixos-laptop/configuration.nix
index 8694a4c6..4dbf6821 100644
--- a/hosts/nixos-laptop/configuration.nix
+++ b/hosts/nixos-laptop/configuration.nix
@@ -1,5 +1,8 @@
 { lib, config, pkgs, ... }: {
 
+  # Set the networking hostname:
+  networking.hostname = "nixos-laptop";
+
   # Enable swap on luks
   boot.initrd.luks.devices."luks-9704447e-6bd0-4a35-9c24-20cbab81c431".device = "/dev/disk/by-uuid/9704447e-6bd0-4a35-9c24-20cbab81c431";
   boot.initrd.luks.devices."luks-9704447e-6bd0-4a35-9c24-20cbab81c431".keyFile = "/crypto_keyfile.bin";