diff --git a/src/mainboard/google/hatch/variants/hatch/overridetree.cb b/src/mainboard/google/hatch/variants/hatch/overridetree.cb
index 9484e8a73e..3b87151345 100644
--- a/src/mainboard/google/hatch/variants/hatch/overridetree.cb
+++ b/src/mainboard/google/hatch/variants/hatch/overridetree.cb
@@ -68,11 +68,11 @@ chip soc/intel/cannonlake
 	register "sdcard_cd_gpio" = "vSD3_CD_B"
 
 	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.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""
@@ -80,8 +80,8 @@ chip soc/intel/cannonlake
 				register "wake" = "GPE0_DW0_21"
 				device i2c 15 on end
 			end
-		end # I2C #0
-		device pci 15.1 on
+		end
+		device ref i2c1		on
 			chip drivers/i2c/generic
 				register "hid" = ""ELAN0001""
 				register "desc" = ""ELAN Touchscreen""
@@ -126,7 +126,7 @@ chip soc/intel/cannonlake
 				device generic 0 on end
 			end
 		end # I2C #1
-		device pci 15.3 on
+		device ref i2c3		on
 			chip drivers/i2c/sx9310
 				register "desc" = ""SAR Proximity Sensor""
 				register "irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW(GPP_A0)"
@@ -142,8 +142,8 @@ chip soc/intel/cannonlake
 				register "proxraw_strength" = "0"
 				device i2c 28 on end
 			end
-		end # I2C #3
-		device pci 19.0 on
+		end
+		device ref i2c4		on
 			chip drivers/i2c/generic
 				register "hid" = ""10EC5682""
 				register "name" = ""RT58""
@@ -156,8 +156,8 @@ chip soc/intel/cannonlake
 				register "property_list[0].integer" = "1"
 				device i2c 1a on end
 			end
-		end #I2C #4
-		device pci 1e.3 on
+		end
+		device ref gspi1	on
 			chip drivers/spi/acpi
 				register "name" = ""CRFP""
 				register "hid" = "ACPI_DT_NAMESPACE_HID"
@@ -167,8 +167,8 @@ chip soc/intel/cannonlake
 				register "wake" = "GPE0_DW0_23"
 				device spi 1 on end
 			end # FPMCU
-		end # GSPI #1
-		device pci 1f.3 on
+		end
+		device ref hda		on
 			chip drivers/generic/max98357a
 				register "hid" = ""MX98357A""
 				register "sdmode_gpio" =  "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_H3)"
@@ -181,7 +181,7 @@ chip soc/intel/cannonlake
 				register "mic_tplg" = "_2ch_pdm0"
 				device generic 0 on end
 			end
-		end # Intel HDA
+		end
 	end
 
 end