Use new instance id at various places

(from redmine: issue id 1885, created on 2014-10-07 by gmueller, closed on 2014-10-07)