s/id/__id__ for metadata

Fixes #41