Make use of ID

For some reason we were never using the supplied ID.