diff --git a/flake.nix b/flake.nix
index 6479679..d60d1da 100644
--- a/flake.nix
+++ b/flake.nix
@@ -61,6 +61,32 @@
       };
     };
 
+    # Surface Configuration
+    nixosConfigurations = {
+      xv-surface = nixpkgs.lib.nixosSystem {
+        system = "x86_64-linux";
+        specialArgs = { inherit inputs; };
+        modules = [
+          ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
+
+          inputs.nixos-hardware.nixosModules.surface-go
+          ./hosts/surface
+        ];
+      };
+    };
+
+    homeConfigurations = {
+      "xeovalyte@xv-surface" = home-manager.lib.homeManagerConfiguration {
+        pkgs = nixpkgs.legacyPackages.x86_64-linux;
+        extraSpecialArgs = { inherit inputs nix-colors; };
+        modules = [
+          ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
+        
+          ./hosts/surface/home.nix
+        ];
+      };
+    };
+
     nixosConfigurations = {
       xv-desktop = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";