diff --git a/configuration.nix b/configuration.nix
index 58e2155..3802043 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -34,7 +34,7 @@
    time.timeZone = "America/Denver";
 
    # Enter keyboard layout
-   services.xserver.layout = "us";
+   services.xserver.xkb.layout = "us";
 
    # Define user accounts
    users.users.aaronh = {
@@ -101,7 +101,7 @@
 
    services.avahi = {
       enable = true;
-      nssmdns = true;
+      #nssmdns4 = true;
       openFirewall = true;
          # Needed for detecting scanners
          publish = {
@@ -126,6 +126,6 @@
    };
 
    # System 
-   system.stateVersion = "23.11";
+   system.stateVersion = "24.05";
    system.autoUpgrade.enable = true;
 }
diff --git a/flake.nix b/flake.nix
index 6b26954..a1e0eac 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,14 +2,15 @@
    description = "Generic System Flake file";
 
    inputs = {
-      nixpkgs.url = "github:NixOS/nixpkgs/release-23.11";
+      # nixpkgs.url = "github:NixOS/nixpkgs/release-23.11";
+      nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
       disko = {
          url = github:nix-community/disko;
          inputs.nixpkgs.follows = "nixpkgs";
       };
       home-manager = {
-         url = "github:nix-community/home-manager/release-23.11";
-         inputs.nixpkgs.follows = "nixpkgs"; # Use system packages list where available
+         url = "github:nix-community/home-manager";
+         inputs.nixpkgs.follows = "nixpkgs";
       };
       nixos-hardware.url = "github:NixOS/nixos-hardware/master";
    };