diff --git a/src/drivers/bmi160/bmi160.cpp b/src/drivers/bmi160/bmi160.cpp
index 44b42eab73..6e5ba02e56 100644
--- a/src/drivers/bmi160/bmi160.cpp
+++ b/src/drivers/bmi160/bmi160.cpp
@@ -1288,8 +1288,8 @@ BMI160::measure()
 	arb.temperature_raw = report.temp;
 	arb.temperature = _last_temperature;
 
-	/* TODO return unique hardware ID */
-	arb.device_id = 0;
+	/* Return class instance as a surrogate device ID */
+	arb.device_id = _accel_class_instance;
 
 	grb.x_raw = report.gyro_x;
 	grb.y_raw = report.gyro_y;
@@ -1324,8 +1324,8 @@ BMI160::measure()
 	grb.temperature_raw = report.temp;
 	grb.temperature = _last_temperature;
 
-	/* TODO return unique hardware ID */
-	grb.device_id = 0;
+	/* Use class instance as a surrogate hardware ID */
+	grb.device_id = _gyro->_gyro_class_instance;
 
 	_accel_reports->force(&arb);
 	_gyro_reports->force(&grb);
diff --git a/src/drivers/l3gd20/l3gd20.cpp b/src/drivers/l3gd20/l3gd20.cpp
index c6bad7c6c2..ed59eed939 100644
--- a/src/drivers/l3gd20/l3gd20.cpp
+++ b/src/drivers/l3gd20/l3gd20.cpp
@@ -1075,8 +1075,8 @@ L3GD20::measure()
 	report.scaling = _gyro_range_scale;
 	report.range_rad_s = _gyro_range_rad_s;
 
-	/* TODO return unique hardware ID */
-	report.device_id = 0;
+	/* Return class instance as a surrogate device ID */
+	report.device_id = _class_instance;
 
 	_reports->force(&report);
 
diff --git a/src/drivers/lsm303d/lsm303d.cpp b/src/drivers/lsm303d/lsm303d.cpp
index 0295fca6dd..ee62e7ffa8 100644
--- a/src/drivers/lsm303d/lsm303d.cpp
+++ b/src/drivers/lsm303d/lsm303d.cpp
@@ -1642,8 +1642,8 @@ LSM303D::measure()
 	accel_report.scaling = _accel_range_scale;
 	accel_report.range_m_s2 = _accel_range_m_s2;
 
-	/* TODO return unique hardware ID */
-	accel_report.device_id = 0;
+	/* Return class instance as a surrogate device ID */
+	accel_report.device_id = _accel_class_instance;
 
 	_accel_reports->force(&accel_report);
 
diff --git a/src/drivers/mpu6000/mpu6000.cpp b/src/drivers/mpu6000/mpu6000.cpp
index 08b5c7c985..11245b3e01 100644
--- a/src/drivers/mpu6000/mpu6000.cpp
+++ b/src/drivers/mpu6000/mpu6000.cpp
@@ -2030,8 +2030,8 @@ MPU6000::measure()
 	arb.temperature_raw = report.temp;
 	arb.temperature = _last_temperature;
 
-	/* TODO return unique hardware ID */
-	arb.device_id = 0;
+	/* Return class instance as a surrogate device ID */
+	arb.device_id = _accel_class_instance;
 
 	grb.x_raw = report.gyro_x;
 	grb.y_raw = report.gyro_y;
@@ -2066,8 +2066,8 @@ MPU6000::measure()
 	grb.temperature_raw = report.temp;
 	grb.temperature = _last_temperature;
 
-	/* TODO return unique hardware ID */
-	grb.device_id = 0;
+	/* Return class instance as a surrogate device ID */
+	grb.device_id = _gyro->_gyro_class_instance;
 
 	_accel_reports->force(&arb);
 	_gyro_reports->force(&grb);
diff --git a/src/drivers/mpu6500/mpu6500.cpp b/src/drivers/mpu6500/mpu6500.cpp
index 186c45013c..3804a1fcc4 100644
--- a/src/drivers/mpu6500/mpu6500.cpp
+++ b/src/drivers/mpu6500/mpu6500.cpp
@@ -1833,8 +1833,8 @@ MPU6500::measure()
 	arb.temperature_raw = report.temp;
 	arb.temperature = _last_temperature;
 
-	/* TODO return unique hardware ID */
-	arb.device_id = 0;
+	/* Return class instance as a surrogate device ID */
+	arb.device_id = _accel_class_instance;
 
 	grb.x_raw = report.gyro_x;
 	grb.y_raw = report.gyro_y;
@@ -1869,7 +1869,8 @@ MPU6500::measure()
 	grb.temperature_raw = report.temp;
 	grb.temperature = _last_temperature;
 
-	/* TODO return unique hardware ID */
+	/* Use class instance as a surrogate hardware ID */
+	grb.device_id = _gyro->_gyro_class_instance;
 	grb.device_id = 0;
 
 	_accel_reports->force(&arb);
diff --git a/src/drivers/mpu9250/mpu9250.cpp b/src/drivers/mpu9250/mpu9250.cpp
index 8bbe1fb6b6..cb4b6aecf8 100644
--- a/src/drivers/mpu9250/mpu9250.cpp
+++ b/src/drivers/mpu9250/mpu9250.cpp
@@ -1424,8 +1424,8 @@ MPU9250::measure()
 	arb.temperature_raw = report.temp;
 	arb.temperature = _last_temperature;
 
-	/* TODO return unique hardware ID */
-	arb.device_id = 0;
+	/* Return class instance as a surrogate device ID */
+	arb.device_id = _accel_class_instance;
 
 	grb.x_raw = report.gyro_x;
 	grb.y_raw = report.gyro_y;
@@ -1460,8 +1460,8 @@ MPU9250::measure()
 	grb.temperature_raw = report.temp;
 	grb.temperature = _last_temperature;
 
-	/* TODO return unique hardware ID */
-	grb.device_id = 0;
+	/* Use class instance as a surrogate hardware ID */
+	grb.device_id = _gyro->_gyro_class_instance;
 
 	_accel_reports->force(&arb);
 	_gyro_reports->force(&grb);