-let lexicon_file_of_baseuri ~basedir ~baseuri =
- let path = basedir ^ "/xml" ^ Pcre.replace ~pat:"^cic:" ~templ:"" baseuri in
- path ^ ".lexicon"
+let obj_file_of_baseuri ~must_exist ~writable ~baseuri =
+ resolve ~must_exist ~writable ~local:true baseuri ^ ".moo"
+let lexicon_file_of_baseuri ~must_exist ~writable ~baseuri =
+ resolve ~must_exist ~writable ~local:true baseuri ^ ".lexicon"