Fix some last places still using id

This is some places where we forgot to change in the past.

Change-Id: I37460b09237402b2dfcb35ea618cfaf7ae84ca75
Merge "Fix some last places still using id"