Fix up the allocation of the IDs to not waste name space

Signed-off-by: Nick Lambourne <nick.lambourne@gmail.com>