Use ref-id for all trs

Fixes #44