Moving ids to h2s

Fixes #564, probably...