diff --git a/src/mainboard/google/hatch/variants/nightfury/overridetree.cb b/src/mainboard/google/hatch/variants/nightfury/overridetree.cb
index 316066b2fb..24324b9049 100644
--- a/src/mainboard/google/hatch/variants/nightfury/overridetree.cb
+++ b/src/mainboard/google/hatch/variants/nightfury/overridetree.cb
@@ -121,81 +121,44 @@ chip soc/intel/cannonlake
 	register "common_soc_config.emmc_dll.emmc_rx_strobe_cntl" = "0x1515"
 
 	device domain 0 on
-		device pci 02.0 on	# Integrated Graphics Device
+		device ref igpu		on
 			register "gfx" = "GMA_DEFAULT_PANEL(0)"
 		end
-		device pci 14.0 on
+		device ref xhci		on
 			chip drivers/usb/acpi
-				device usb 0.0 on
+				device ref xhci_root_hub on
 					chip drivers/usb/acpi
-						register "desc" = ""Left Type-C Port""
-						register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
-						register "group" = "ACPI_PLD_GROUP(1, 1)"
-						device usb 2.0 on end
+						device ref usb2_port3 off end
 					end
 					chip drivers/usb/acpi
-						register "desc" = ""Right Type-C Port""
-						register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
-						register "group" = "ACPI_PLD_GROUP(2, 1)"
-						device usb 2.1 on end
+						device ref usb2_port4 off end
 					end
 					chip drivers/usb/acpi
-						device usb 2.2 off end
+						device ref usb2_port5 off end
 					end
 					chip drivers/usb/acpi
-						device usb 2.3 off end
+						device ref usb2_port6 off end
 					end
 					chip drivers/usb/acpi
-						device usb 2.4 off end
+						device ref usb2_port8 off end
 					end
 					chip drivers/usb/acpi
-						device usb 2.5 off end
+						device ref usb2_port9 off end
 					end
 					chip drivers/usb/acpi
-						register "desc" = ""Camera""
-						register "type" = "UPC_TYPE_INTERNAL"
-						device usb 2.6 on end
+						device ref usb3_port3 off end
 					end
 					chip drivers/usb/acpi
-						device usb 2.7 off end
+						device ref usb3_port4 off end
 					end
 					chip drivers/usb/acpi
-						device usb 2.8 off end
-					end
-					chip drivers/usb/acpi
-						register "desc" = ""Bluetooth""
-						register "type" = "UPC_TYPE_INTERNAL"
-						register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_C14)"
-						device usb 2.9 on end
-					end
-					chip drivers/usb/acpi
-						register "desc" = ""Left Type-C Port""
-						register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
-						register "group" = "ACPI_PLD_GROUP(1, 1)"
-						device usb 3.0 on end
-					end
-					chip drivers/usb/acpi
-						register "desc" = ""Right Type-C Port""
-						register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
-						register "group" = "ACPI_PLD_GROUP(2, 1)"
-						device usb 3.1 on end
-					end
-					chip drivers/usb/acpi
-						device usb 3.2 off end
-					end
-					chip drivers/usb/acpi
-						device usb 3.3 off end
-					end
-					chip drivers/usb/acpi
-						device usb 3.4 off end
+						device ref usb3_port5 off end
 					end
 				end
 			end
 		end
-
-		device pci 14.5 on  end # SDCard
-
-		device pci 15.0 on
+		device ref sdxc		on end
+		device ref i2c0		on
 			chip drivers/i2c/generic
 				register "hid" = ""ELAN0000""
 				register "desc" = ""ELAN Touchpad""
@@ -204,9 +167,8 @@ chip soc/intel/cannonlake
 				register "wake" = "GPE0_DW0_21"
 				device i2c 0x15 on end
 			end
-		end # I2C 0
-
-		device pci 15.1 on
+		end
+		device ref i2c1		on
 			chip drivers/i2c/hid
 				register "generic.hid" = ""ELAN902C""
 				register "generic.desc" = ""ELAN Touchscreen""
@@ -219,9 +181,8 @@ chip soc/intel/cannonlake
 				register "hid_desc_reg_offset" = "0x01"
 				device i2c 0x10 on end
 			end
-		end # I2C #1
-
-		device pci 19.0 on
+		end
+		device ref i2c4		on
 			chip drivers/i2c/da7219
 				# TODO: these settings were copied from another board
 				# with the same chip. verify the settings
@@ -258,17 +219,16 @@ chip soc/intel/cannonlake
 				device i2c 0x39 on end
 			end
 		end
-
 		# No PCIe WiFi
-		device pci 1d.5 off end
-		device pci 1a.0 on  end #eMMC
-		device pci 1f.3 on
+		device ref pcie_rp14	off end
+		device ref emmc		on end
+		device ref hda		on
 			chip drivers/sof
 				register "spkr_tplg" = "max98390"
 				register "jack_tplg" = "da7219"
 				register "mic_tplg" = "_2ch_pdm0"
 				device generic 0 on end
 			end
-		end # Intel HDA
-	end # domain
+		end
+	end
 end