Further updates based on @mweimerskirch PR.

Replaces all uses of the `id` class property with the new `ids` property.